Skip to content

Conversation

@en-sc
Copy link
Collaborator

@en-sc en-sc commented Oct 27, 2025

There were two patches to RISC-V OpenOCD that caused the conflicts that were misresolved:

  1. Improve support for GD32VF103 MCU #538, that was further upstreamed at https://review.openocd.org/c/openocd/+/6957.
  2. Update gd32vf103.cfg #640

I've reverted #640 -- Specifying the adapter speed seems better placed in board config or in the command line and transport select jtag is already present in the mainline version.
After that the file was reset to the version for upstream (7ac389c).

en-sc added 2 commits October 27, 2025 15:42
This reverts commit 13cfec4 ("Update
gd32vf103.cfg (riscv-collab#640)")

Change-Id: I505f12a78efc2da498adb0648116581a5103ec4c
Signed-off-by: Evgeniy Naydanov <[email protected]>
The file was patched in riscv-collab#538. The patch was then upstreamed and further
refined in [1].

This resulted in merge conflicts that were poorly resolved.

Fix the resolutions by resetting the file to the version from the
mainline OpenOCD (commit 7ac389c ("tcl/target/gd32vf103: work
around broken ndmreset")).

Link: https://review.openocd.org/c/openocd/+/6957 [1]
Change-Id: I2663553fead59f3615a2d6af0aebe500ae086525
Signed-off-by: Evgeniy Naydanov <[email protected]>
@en-sc
Copy link
Collaborator Author

en-sc commented Oct 27, 2025

@groencode, @tchebb, FIY.

@en-sc
Copy link
Collaborator Author

en-sc commented Oct 27, 2025

@tom-van, could you please take a look at this one?

@tom-van
Copy link
Contributor

tom-van commented Oct 27, 2025

We have a couple of old pending patches where author did not respond to my comments
6959: tcl/target/gd32vf103: copy a few minor settings from riscv-openocd | https://review.openocd.org/c/openocd/+/6959

  • adding $_TARGETNAME riscv set_enable_virt2phys off is undoubtedly good, but the command name changed in riscv sync series
  • adding bs tap just prevents some messages at startup/reconnect and surely cannot be combined with reset_config srst_nogate

6958: tcl/target/gd32vf103: add main flash alias | https://review.openocd.org/c/openocd/+/6958

  • probably nonsense

Yes, merge it as-is and later we can add riscv virt2phys_mode off in both upstream and here.

@en-sc en-sc requested a review from MarekVCodasip October 27, 2025 15:06
@tchebb
Copy link
Contributor

tchebb commented Oct 27, 2025

I'm the author of the upstream patches as well as the more fiddly bits of the downstream version. Sorry for disappearing: I was busy when the patches were reviewed and then had forgotten a lot of the details once I had time again.

I'll check out the current state of things later today and respond to the upstream patches as appropriate.

@tom-van
Copy link
Contributor

tom-van commented Oct 27, 2025

Great, welcome back! I still have the Sipeed Longan Nano somewhere on a shelf

@tchebb
Copy link
Contributor

tchebb commented Oct 28, 2025

I've rebased and responded to both outstanding upstream changelists. I recall now that it was the changes you made to https://review.openocd.org/c/openocd/+/6957 that I kept getting stuck on, not the simpler feedback in the other two.

+1 to this PR, too. gd32vf103.cfg seems to have gotten quite mangled in the merges, so this will much improve it even if you leave out the pending upstream CLs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants